From f06e83208866f9e6cccee051704de153a6f97b3a Mon Sep 17 00:00:00 2001 From: Keir Fraser Date: Mon, 4 Aug 2008 11:06:31 +0100 Subject: [PATCH] xm: fix up exception handling when spawning vnc viewer. From: Ian Jackson Signed-off-by: Keir Fraser --- tools/python/xen/xm/console.py | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/tools/python/xen/xm/console.py b/tools/python/xen/xm/console.py index 8abcb1d9a6..0b83f1139d 100644 --- a/tools/python/xen/xm/console.py +++ b/tools/python/xen/xm/console.py @@ -40,14 +40,12 @@ class OurXenstoreConnection: while True: result = self.handle.read('0', path) if result is not None: + signal.alarm(0) return result self.handle.read_watch() - self.handle.unwatch(path, watch) - signal.alarm(0) - except: + finally: signal.alarm(0) if watch is not None: self.handle.unwatch(path, watch) - raise def read_maybe(self, path): return self.handle.read('0', path) -- 2.30.2